include <pango/pango.h> instead of <pango/pango-layout.h>.

2008-04-25  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkprintcontext.h: include <pango/pango.h> instead of
	<pango/pango-layout.h>.

	* gtk/gtkiconfactory.c
	* gtk/gtkimmodule.c
	* gtk/gtkmain.c
	* gtk/gtkmodules.c
	* gtk/queryimmodules.c: remove inclusion of single files from
	pango, none of them was actually needed.

	* modules/input/gtkimcontextime.c: include <pango/pango.h> instead of
	<pango/pango-utils.h>.

svn path=/trunk/; revision=20042

diff --git a/ChangeLog b/ChangeLog
index ad4963c665d9318ec38ba2e34254e6f02f183bf6..ed6743e35073378569dd4ba0ac4a68123ae499c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-04-25  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkprintcontext.h: include <pango/pango.h> instead of
+       <pango/pango-layout.h>.
+
+       * gtk/gtkiconfactory.c
+       * gtk/gtkimmodule.c
+       * gtk/gtkmain.c
+       * gtk/gtkmodules.c
+       * gtk/queryimmodules.c: remove inclusion of single files from
+       pango, none of them was actually needed.
+
+       * modules/input/gtkimcontextime.c: include <pango/pango.h> instead of
+       <pango/pango-utils.h>.
+
 2008-04-25  Michael Natterer  <mitch@imendio.com>
 
        * gdk/gdkfont.h: include <pango/pango.h> instead of

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 36fedbcb590d1679de93df906c27761a126931ac..da44564f11dd413780fda057c3f156032a90abd3 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <pango/pango-utils.h> /* For pango_scan_* */
 #include "gtkiconfactory.h"
 #include "gtkiconcache.h"
 #include "gtkdebug.h"

diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 9f68f624664e96398e8c6f1c30ce295beaf34e45..6564832db6739a5851e76d4ee7f34a086d9b947f 100644 (file)
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -32,7 +32,6 @@
 
 #include <glib/gstdio.h>
 #include <gmodule.h>
-#include <pango/pango-utils.h>
 #include "gtkimmodule.h"
 #include "gtkimcontextsimple.h"
 #include "gtksettings.h"

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 6749252c106369d2ea4aee2a26b1f5f3a9d5e900..e8f386751b8016772f72353da21cc8b2f37b0534 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -49,8 +49,6 @@
 #undef STRICT
 #endif
 
-#include <pango/pango-types.h> /* For pango_language_from_string */
-
 #include "gtkintl.h"
 
 #include "gtkaccelmap.h"

diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 23e6bbbf62076b5d7a1b4d2ec26464381972ce5c..280b7fcd6b2c76b1fc2aaa921b40f257ae89ec2e 100644 (file)
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -30,7 +30,6 @@
 #include "gtkalias.h"
 
 #include <gmodule.h>
-#include <pango/pango-utils.h> /* For pango_split_file_list */
 
 typedef struct _GtkModuleInfo GtkModuleInfo;
 struct _GtkModuleInfo

diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index 936cae4f4033a1dd004b1a1b3ac46af5313b5e32..f754ecdd1d2044a87f38c7594a91990a16e8a9c2 100644 (file)
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -22,7 +22,7 @@
 #define __GTK_PRINT_CONTEXT_H__
 
 #include <glib-object.h>
-#include <pango/pango-layout.h>
+#include <pango/pango.h>
 #include "gtkenums.h"
 #include "gtkpagesetup.h"
 

diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
index 90310524c16dbcf3d487153b7c6b3d9425c085f0..4c46a8842d9f03777fb0368c3d07f9fbb81ebcf6 100644 (file)
--- a/gtk/queryimmodules.c
+++ b/gtk/queryimmodules.c
@@ -37,7 +37,6 @@
 #define SOEXT ("." G_MODULE_SUFFIX)
 #endif
 
-#include <pango/pango-utils.h>
 #include "gtk/gtkrc.h"
 #include "gtk/gtkimmodule.h"
 #include "gtk/gtkversion.h"

diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index 615e6a1f60df06b8d7228f6acfb040c3f79a71d9..4a31063c22cf818c0f4fa90a12a16eeda151e4f8 100644 (file)
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -33,7 +33,7 @@
 #include "gdk/gdkkeysyms.h"
 #include "gtk/gtkwidget.h"
 
-#include <pango/pango-utils.h>
+#include <pango/pango.h>
 
 /* avoid warning */
 #ifdef STRICT